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

* commit '4b4b44381b133e9ab7418806c046774b7fd31393':
  Fewer warnings in aidl generated code.