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

Change-Id: I0b8ae6345f94d83b90028e2720d436b4e832d829