am ccb44c38: am 4c694e07: am ca48f581: Merge "Improve standalone bcc for on-device compilation."

* commit 'ccb44c3834b760b8f4a8c849cdcfe3944dd7a6f7':
  Improve standalone bcc for on-device compilation.