Android O Preview Release 1 (OPP1.170223.013)
Merge "Revert "Fix code for more restrictive compiler [options]""
am: 4138eed6f4

Change-Id: Ic7e4a2e8a8096288980091a7a47af4ebd5463c0f