Merge "Revert "Updating prebuilts for 2016-12 samples release"" into nyc-mr1-dev am: 8287120f am: 92feb462 am: 0d452085 Change-Id: I76421ff0bc3e4d102069f240d7e8965c9f2508bd