am 135fdcc7: am a6d16725: am a73e0045: Merge "Revert "Tighten up compiler flags for aidl""

* commit '135fdcc76c6560706e77edfa1467d78a2c1f1e86':
  Revert "Tighten up compiler flags for aidl"