Manually merge changes from giant AOSP topic

Change-Id: I5c556d855d85bd8aab51bac92c25855501bb4e60
tree: 3f9feadc4dfe11e4660df8c7d1a045e209930087
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml