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

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