Merge "Unrevert "Revert "Updating prebuilts for 2016-12 samples release""" into nyc-mr1-dev