Merge "Unrevert "Revert "Updating prebuilts for 2016-12 samples release""" into nyc-mr1-dev am: 7a756e15 am: 3eef1b5e Change-Id: Ibfa30f50fbffd2c6315f1a2b83f87cac0dd98889