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

Change-Id: Ib1b9ab44d5a50c784e2fc2782982536a9063ee30