Merge 7b510d7b6766c951fb252d0adc842ab6627b7a17 on remote branch

Change-Id: I779f9a23f9d4b6c3c2cc12999a3fb918aee7b2a2
tree: 22e55d913a929e673a9916ee823016625219979b
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml
  5. build.gradle