Merging ub-launcher3-qt-r1-dev, build 5622904 am: 889619eab9
am: accd6e864b

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