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

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