Android VTS 8.0 Release 8 (4744587)
Merge "Prepare for removal of legacy-test from default targets" am: a691d6c012 am: 1fc636d62b am: 488ffd1db1
am: 60d4545611

Change-Id: If8d5ee3ac45308c0a154c828286eff5939e92293