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

Change-Id: Ia8539e7a44bd0d394db7a65a2ea710a3bbfd341b