Merge "Revert "Tighten up compiler flags for aidl""