am 3ff6e1d4: am 937c295d: Merge "Update aprotoc prebuilts."

* commit '3ff6e1d43754b686b936cb4d533f25cc87272322':
  Update aprotoc prebuilts.