Android N IOT Preview 4 (NIH40E)
Merge "Revert "Fix code for more restrictive compiler [options]"" am: 4138eed6f4 am: ea213ab0d2
am: 87d17d0acd

Change-Id: I706602375cc670ba531db6ab5b4446be1fae5b2f