Merge mainline-release 6664920 to stage-aosp-master - DO NOT MERGE

Merged-In: I6c46fd6b04afb29e8173dcc9e8677bd73d362908
Change-Id: I1c863fb85b7343bf825dc9ee95f899ae44f6c8a3
tree: fa3a9eb79ef34b54ad062dd1c22889d1495c4f1d
  1. res/
  2. src/
  3. .gitignore
  4. Android.bp
  5. AndroidManifest.xml
  6. project.properties