Merge "Tighten up compiler flags for aidl"