Syncing latest sample prebuilts for nyc-dev. am: a0159663d1  -s ours am: 97d90c624a
am: 2dbc6bfb0a

Change-Id: I371d45b2e17373764c830c75954b233f9aef3fda