Merge "Revert "Fix code for more restrictive compiler [options]"" am: 4138eed6f4 am: ea213ab0d2 am: 87d17d0acd
am: e6e060c9da  -s ours

Change-Id: I60fce4893ceba613a72424e516ba0eb89c0374a6