Revert "Updating prebuilts for 2016-12 samples release" am: a459ec33b9 am: c683ce30cc am: 1c930cecc5
am: 6a5e36f9b3

Change-Id: Id08de1028ab5cfae501f554c127eca24120f4b5d