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

Change-Id: I76fc302a582a9173f9bb4e9103ed8160084e438a