Merge "Add a getEndpointInfo accessor to AIDL-generated RPC proxy classes" into ics-aah