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

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

Change-Id: I9267b3f8586d74b503d83ea4afa72741f294cf1b