Merge branch android10-qpr2-release

Change-Id: I9a7aa9ecb15cd4d8d9f22c0d9ced79d3b4f4d157
tree: 101b209004c47193dc7e8ccb5a9bd20dcc1f60ab
  1. Android.mk
  2. AndroidManifest.xml
  3. res/
  4. src/
  5. tests/