Merge "aidl: corrected ERROR_GENERAL_FAILURE description."