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

Change-Id: I461535baf83215a6f765d7c09c6aed62ee6711e5