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

Change-Id: Id5fffc61617078af0ca6cb41554e773277f8bce4