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

Merged-In: I2ea4cbc8e8e3e94447960e64cc6d39b44df474ff
Change-Id: I7bc3cf534c65a5b976b410f0050e6a5caca312fc
tree: 163920c8e35f050784eb2dca9cebe0c9983c5ebb
  1. res/
  2. src/
  3. .gitignore
  4. Android.bp
  5. AndroidManifest.xml
  6. project.properties