Merge "Remove unused build flags"
am: 6cd9a36e79

Change-Id: I04d52d8c2b52ba48050a906308e0768bd2a9291e