Remove PROTOC override am: baacca3732
am: 453e927161

Change-Id: Id4e08b812b8976ca83610942ebbbf442af54070c