Merge branch 'ub-launcher3-master' into merge_5429563

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