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

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