Merge \"Fixes delay when playing first sound in BootAnimation\" into nyc-mr1-dev
am: ebfa6df9a0

Change-Id: Id8b55b666ddd21f5ad767635ff68c2e82edfa2f8