Merge stage-aosp-master to aosp-master - DO NOT MERGE am: 4642e27b37 am: 76195e328f

Change-Id: I8894c88053e539abf8de35975a83e09bd93de8d3
tree: 55786573d3cfb58fae53085826d4477522c933b4
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. build.gradle
  6. OWNERS