Merge from jb-dev for "sample video corruption in MediaCodec mode." DO NOT MERGE

jb-dev commit: fa2b8f243eb048fb2b8e5a14356190f69eb31a36

Change-Id: I4f08b9c8e9682a998db01c509a390e51bae60c2d
related-to-bug: 6732061
5 files changed