Merge "Add API 25 prebuilts." into nyc-mr1-dev