Revive compile options mistakenly dropped by I101334d1a5132

Some configurations were mistakenly dropped during rebasing.

Test: build
Change-Id: I2f867a8cbb52fe772be1e8c40cea73b7d252049e
1 file changed