Merge branch android10-qpr1-release

Change-Id: I515f6abcfea7b055a6604c6629fd5dd502232f15
tree: 70d77d82cccebf5574e6839538fe84277de353da
  1. res/
  2. src/
  3. Android.mk
  4. AndroidManifest.xml