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