Merge \"Add API 24 prebuilts.\" into nyc-dev
am: 6c79923e12

Change-Id: I99c28a71b66ba94ee1efd4ee684afc95debf89ec