am 5fa874a3: am 26627d70: am 4d6cb77a: Merge "Tighten up compiler flags for aidl"

* commit '5fa874a30bea0c9c03eda58579c50d552a16bcba':
  Tighten up compiler flags for aidl