Make this commit opt-in:  https://github.com/pbeeler/android_build/commit/f89bcfb8e5b1b4e8320d0a3e2d89b668b1988596

To enable export USE_MORE_OPT_FLAGS=yes