Manually merge changes from giant AOSP topic

Change-Id: I241b6b7d23e782f5efb5ad4ff1673c0d535000a0
tree: 04cce7643d648db7950be8c7a59503b13f6aef4c
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. MODULE_LICENSE_APACHE2
  6. NOTICE