Merge "Unrevert "Revert "Updating prebuilts for 2016-12 samples release""" into nyc-mr1-dev am: 7a756e154d
am: 3eef1b5ecc

Change-Id: Ie9becf112e0d15a1cd4b3cf1ac3fc6b157ca12c2