Android N IOT Preview 4 (NIH40E)
Prepare for removal of legacy-test from default targets am: 1c656b29b5 am: eb74e35e10
am: 4de6231164

Change-Id: Iefc538d13d91f8011af0001b1e3a18ea9c00e2f8