Merge "Prepare for removal of legacy-test from default targets" am: 382bc45b8f
am: 90b8532341

Change-Id: I8c2f9f76a2125ba768200151f16bfa1c6ee1a05e
tree: 1ce19b70051ab9cc131844f58aa7bb0e972853c8
  1. res/
  2. src/
  3. tests/
  4. Android.mk
  5. AndroidManifest.xml