am 22270a7d: am 2f9fa520: Merge "Fix build breakage due to incorrect bcc_compat RS_TRIPLE."

* commit '22270a7d68c913b735787589fce17874ef2ed4f2':
  Fix build breakage due to incorrect bcc_compat RS_TRIPLE.