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

Change-Id: I47cfee1c7d439e504bdf69db18e382b30eed765f