Android N IOT Preview 4 (NIH40E)
Merge "Prepare for removal of legacy-test from default targets" am: 9c76321f9a am: 23650b2a78
am: b584e2fa9f

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