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

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