Merge "Update aprotoc prebuilts from 2.3 to 2.6."