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

Change-Id: Ie16f87e5ff1295c12f44f30d23e0f096ce7c4d25