DO NOT MERGE - Merge qt-dev-plus-aosp-without-vendor (5699924) into stage-aosp-master
am: 209f1362de

Change-Id: Iaa62307f23e3f8ca5576cc330dc224113e5a5547
tree: 87e3e302f0fc3ffc2cb985597c5f1e5c43704bb9
  1. res/
  2. robolectric_tests/
  3. src/
  4. src_override/
  5. Android.mk
  6. AndroidManifest.xml