Merge stage-aosp-master into pi-dev-plus-aosp
am: 5fd84ddcba

Change-Id: I1424455e8e51d863945c9663a97bc793852df13b
tree: 9fc2901a0992b7df227f9b4ddbf7d6ec6ef575e0
  1. assets/
  2. LICENSE
  3. OWNERS
  4. README.txt