Merging ub-launcher3-qt-r1-dev, build 5642509 am: 5e4d53a08b
am: 954829d194

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