Merging ub-launcher3-qt-r1-dev, build 5662440 am: 7c4d224817
am: be888010b5

Change-Id: Iac93327968320ca4b8cba56505a907cb72a5b3fb
tree: 53735ffbc55d7ac0268c14b034b5d00fe0c48671
  1. res/
  2. robolectric_tests/
  3. src/
  4. src_override/
  5. Android.mk
  6. AndroidManifest.xml