Merge "Prepare for removal of legacy-test from default targets" am: 9792d3f9bc am: 3f0eca1adb am: a6a760ac73
am: 038fec7903

Change-Id: I4a961d23b9cbe0afebf0a91256dfd597d5349055
tree: d0eb238b67fd295f485837c56d075987d463b4f5
  1. res/
  2. src/
  3. support/
  4. tests/
  5. Android.mk
  6. AndroidManifest.xml