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

Change-Id: Ib18068e832a23a5b8acc5b21e99e723a5e89bac6