Merge "Add API 25 prebuilts." into nyc-mr1-dev
am: 5e9de23f8c

Change-Id: Ibfa3e86d81c0730149cbe29c063877d6a1691fa2