This undoes the automerger skip which occured in
commit e740c84dc32180214a7fd157105d6c18d30408ee and
replays it as a standard (NOT -s ours) merge.
Change-Id: If5a47be26f73d6a0735c425cd66310a3e2a89086
Top landing page now has a link direct to Preview 2.
The "Program Overview" now explicitly mentions that Preview 2 is available,
and is updated so that it no longer refers to Previews 1 and 2 in the future
tense. "Support" page is renamed to "Support and Release Notes."
TOC revised to reflect new page name. Direct links to Preview 2 are added
to the respective languages' Preview landing pages.
Change-Id: Ic463b123b25224b7064b4771faa79bdfe63e9ff5
