Merge "Add JavaDerive toString to AIDL classes" into tm-dev