Android 8.0.0 Release 16 (OPR4.170623.009)
Merge "Prepare for removal of legacy-test from default targets" am: a7094d8ed1 am: 4ffb04dd9d am: 5ad3c04da5
am: d166148aba

Change-Id: I251673fa685efcb91b7c0159ff6172faade2dc98