Merge cherrypicks of [4871059, 4868580, 4869372] into pi-qpr1-release

Change-Id: I9c8f77bf25e97f0f906ea31474f3b492d1dd3a04
tree: fda3190125995e478fe5dfb9599c12515e9e0d9d
  1. res/
  2. robotests/
  3. src/
  4. support/
  5. tests/
  6. Android.mk
  7. AndroidManifest.xml