Merge "Fix build breakage due to incorrect bcc_compat RS_TRIPLE."