Merge stage-aosp-master to aosp-master - DO NOT MERGE

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