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

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