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

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