Merge "Syncing latest sample prebuilts for nyc-dev." into nyc-dev
am: 0680788dba

Change-Id: I18e2a39bbdb210b15a8f0a4f72116c31d8fa5550