Merge 86f52efb33b6c175193c7213c8954f16136d22f5 on remote branch

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