am 1e30eb42: am 5af06fb7: am 10951263: Merge "Update aprotoc prebuilts to latest master."

* commit '1e30eb423b510f3fc6f73758eaacbd713358fc7c':
  Update aprotoc prebuilts to latest master.