Merge "Switch to standalone bcc compilation path (again)."