Merge 45c6c78d2ff8727d663ace0a58a9736e2e92b037 on remote branch

Change-Id: I3c944a154979b552f3d3ccd77ef00a0513c634d7
tree: 2842b4df5a63d285f3a8a7121175800c1b8e5f5c
  1. res/
  2. src/
  3. Android.bp
  4. AndroidManifest.xml
  5. CleanSpec.mk
  6. NOTICE
  7. proguard.flags