DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: dcbf9c1b5e

Change-Id: I107c0b31775a0b4c290d428756469c11ef24f0b2
tree: ae796d1b0263f7380ac02e6fac4a457f26b93341
  1. Android.bp
  2. AndroidManifest.xml
  3. res/
  4. src/
  5. tests/