Android o preview 2
Merge "Prepare for removal of legacy-test from default targets" am: a7094d8ed1 am: 4ffb04dd9d
am: 5ad3c04da5

Change-Id: I3260d93518620536d59fae5fbc5dbbcf7905b593