Merge "Revert "Fix code for more restrictive compiler [options]""
am: 4138eed6 Change-Id: Ic7e4a2e8a8096288980091a7a47af4ebd5463c0f
Loading
am: 4138eed6 Change-Id: Ic7e4a2e8a8096288980091a7a47af4ebd5463c0f
mentioned in commit ec565bdc
mentioned in commit 87d17d0a
mentioned in commit e6e060c9