Android o preview 2
Merge "Prepare for removal of legacy-test from default targets" am: 5644a6ec76 am: 63c6f8bcb4
am: ea01c26e02

Change-Id: I384097f4dce1f68c9e880e8f2f04f01f4e791c58