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

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