Merging ub-launcher3-qt-r1-dev, build 5781802 am: 45d5cd2c30
am: 00fae36f49

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