Unrevert "Revert "Updating prebuilts for 2016-12 samples release"" am: 2cce381bd5
am: 3701fba23a

Change-Id: Ib3a3ecc510cdf2f27e6f006e99a152cb7d6ccd53