am 65e8d62a: Merge "Fixed sample video corrupted in MediaCodec mode." into jb-dev
* commit '65e8d62a5b243518795cdafa498df4a49baf6940':
Fixed sample video corrupted in MediaCodec mode.
Revert input buffer count for the SoftAAC* decoders back to 4.
Reduce underruns in screen off, esp. with EQ
Added some informational log messages to track down ANR related issues
audioflinger: change session check in createTrack.
Fix static track activity ref counting
Don't allow AudioTrack frameCount to decrease
Fix race in AudioTrack destruction
AudioFlinger: fix tracks ready for mixing logic.
Fix regression in AudioTrack::pause()
Fix ToneGenerator regression