Merge "Prepare for removal of legacy-test from default targets"
am: 9c76321f9a

Change-Id: I81215747e9395ba65224e6400d9e5abc0ce69a10
tree: 9f522a771ebb72183a1e71e916fed54cd37e09eb
  1. java/
  2. tests/
  3. Android.mk
  4. build.gradle