Android N IOT Preview 4 (NIH40E)
Merge "Prepare for removal of legacy-test from default targets" am: 524cce0089 am: f40b38da25
am: 6db7eaee89

Change-Id: Ic239177bae70d78b29eb16acf3cc42e8f31983c3