Merge "Use the protoc from the build, not prebuilts/" am: 5c079a248e
am: 9610029d33

Change-Id: Id80c3ef3585bd3c02599aae425025368ce0c97ce