am 33c5670b: Merge "Fewer warnings in aidl generated code."

* commit '33c5670b315810f1f3dc66fe8cd38f7b3e05f3ac':
  Fewer warnings in aidl generated code.