Merge "Update sample prebults for 2017-02 release (nyc-mr1-dev) am: a9a842cf am: 26181497 am: 38ff69ce" into nyc-mr2-dev-plus-aosp am: e3fed58c Change-Id: Ie07bb0fde66a767dc8c460cfe3bb914fc022b02a