Merge "Revert "Updating prebuilts for 2016-12 samples release"" into nyc-mr1-dev am: 8287120f am: 92feb462 am: 8e49c887 Change-Id: Ic3d6ccc78ae1dac4f592963fab99a0d2c97af348