Merge "Update prebuilts/sdk/current/ to be the same as API 24." am: 71070c19e7 am: e55dcfa1a4
am: ab27ba4b9c

Change-Id: Ie17d371668c0fc5a63bf2b05d939235a6d798e37