Merge "Docs: Near-final changes for Android N/Google IO. Continues ag/1037250." into mnc-io-docs am: e293ff3bf1 am: fc1bb6e14d am: 0cc059436a
am: cc69bae599

* commit 'cc69bae599bcca4b5a291313ac49606e56b47bda':
  Docs: Near-final changes for Android N/Google IO. Continues ag/1037250.

Change-Id: I998cc41972e6a75d71b852e30862de1ccdcf393a