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

Change-Id: Ia68213532ae81efc73f69599108527199371a6d6