Merge branch android10-qpr3-release

Change-Id: I6caa8a62b92ebcea5f11515ef3a339445a49b386
tree: 8de4d9163366e3190eeaa5b0c3852f981e23dc02
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml