Revert "Fix code for more restrictive compiler [options]"

This reverts commit 86fa19c2157314b5a303c5540f0f60cc8c7862cd.

Test: Rebuilt
Change-Id: If47d182a98a6a5bb97477edbd1b62e99a578d851
3 files changed