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

* commit '4d6cb77ad92c9acadb5afc5d80be38dd3b63c3fa':
  Tighten up compiler flags for aidl