Merge change 9670 into donut

* changes:
  Make aidl annotate onTransact with @Override