Merge "Update prebuilts/sdk/current/ to be the same as API 24."