Merge stage-aosp-master to aosp-master - DO NOT MERGE am: 201a0667b3

Change-Id: I9e834f1a993e2fa61e52135a5bb7a19de8d1b2a9
tree: ae796d1b0263f7380ac02e6fac4a457f26b93341
  1. Android.bp
  2. AndroidManifest.xml
  3. res/
  4. src/
  5. tests/