This undoes the automerger skip which occured in
commit e740c84dc3 and
replays it as a standard (NOT -s ours) merge.
Change-Id: If5a47be26f73d6a0735c425cd66310a3e2a89086
remove the overview page, remove a bunch of stuff from the doc
about screens and refer to external docs instead, and add
tips about debugging on 4.4 w/ dev tools.
Change-Id: I1fadb7cdf6fee469dc41a1f4e2dc2daf1fde52d1