Merge changes from topic "aidl_tostring"

* changes:
  [automerge] Add JavaDerive toString to AIDL classes 2p: da10904e96 2p: 83e5c2cdc1
  [automerge] Add JavaDerive toString to AIDL classes 2p: da10904e96
  Add JavaDerive toString to AIDL classes