Merge "Stop SoundPool decode if NdkMediaCodec returns null buffers" into nyc-dev