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

* commit '2b83384f44ffa30d1d3d61ded9ac4f83a275b77d':
  Tighten up compiler flags for aidl