Merge "Put brackets around AIDL_RETURN macro" into sc-dev