Merge "Add JavaDerive toString to AIDL classes"