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