Android 8.1.0 release 22
Merge "Prepare for removal of legacy-test from default targets" am: 524cce0089 am: f40b38da25 am: 6db7eaee89
am: 886d7d1277

Change-Id: I9fc9b526e1ce01ecf07c04d2f12e6f5c59c732f4