Merging ub-launcher3-qt-dev, build 5570425 am: baededcb61
am: d2b6a41fbd

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