Revert "More build flag tweaks"

This reverts commit ae1402a6737218b42ffe53f218bb7ff730f6979e.

Change-Id: I434deec26e3475f52101e236007f713d5d66c6f9