resolve merge conflicts of adc8483604c691dd081433e0e86f0f0da78d31dd to qt-qpr1-dev-plus-aosp

Bug: None
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ie90d0b9d919c7702816338810a8d31fa821b4e59
3 files changed
tree: debc94f56b80621bdaedc8545a856bbffa98e673
  1. Android.mk
  2. AndroidManifest.xml
  3. res/
  4. src/
  5. tests/