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

* commit '26627d7011e8fbd66f0cabac5c3cb2a66c133d08':
  Tighten up compiler flags for aidl