am fead6f02: am 72b1324c: am 2b83384f: Merge "Tighten up compiler flags for aidl"

* commit 'fead6f025bafca5af922f4c644a00c0dca297413':
  Tighten up compiler flags for aidl