am 747cb3b5: Merge change 9670 into donut

Merge commit '747cb3b515e1b01f6b61ec911b693d88d480eaaf'

* commit '747cb3b515e1b01f6b61ec911b693d88d480eaaf':
  Make aidl annotate onTransact with @Override