Merge "Revert "Switch to standalone bcc compilation path.""