Merging ub-launcher3-qt-r1-dev, build 5691421 am: 427aa9b82c
am: 8056fb9145

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