Merge sc-dev-plus-aosp-without-vendor@7634622

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