am 65e8d62a: Merge "Fixed sample video corrupted in MediaCodec mode." into jb-dev

* commit '65e8d62a5b243518795cdafa498df4a49baf6940':
  Fixed sample video corrupted in MediaCodec mode.
merge in jb-mr0-release history after reset to jb-dev
Reconcile with jb-mr0-release

Change-Id: I783dd9fbd723bb284932123dfa9e06fb7c7ab879
Reconcile with jb-release

Change-Id: Iab9b19384ab6706f1dfca89f21ffc142f47225a3
am ffd99cb7: Merge "Shutter sound is heard at the end of the recorded video"

* commit 'ffd99cb795c92caee7f4bd0b26af9ae37b100fc3':
  Shutter sound is heard at the end of the recorded video
am b7ee9c44: Merge "mediacodec: Return an error on getOutputFormat if there is no output format yet"

* commit 'b7ee9c4436c50cc5ff6e72059bf27c2c16dc1b92':
  mediacodec: Return an error on getOutputFormat if there is no output format yet
am 874a074a: Merge "avcenc: Switch malloc/free callbacks to use pointers instead of ints"

* commit '874a074ad88117d9fabf178b5b4a1c885dc512f5':
  avcenc: Switch malloc/free callbacks to use pointers instead of ints
am 0822156c: Merge "avcenc: Fix indentation"

* commit '0822156cfd25c111cd33932ee9a89b3100d0350c':
  avcenc: Fix indentation
am 67f694d6: Merge "Initialize pool\'s buffer pointers to null."

* commit '67f694d6b4234ea0d7ce2f8be8e6a9cc3b104eb9':
  Initialize pool's buffer pointers to null.
am 0ab18f85: Merge "avcenc: Remove useless casts"

* commit '0ab18f853571149de700930fbb783ecd6b2c5582':
  avcenc: Remove useless casts
am b71298ee: Merge "avcenc: Initialize all memory allocated by the CBAVC_Malloc callback function"

* commit 'b71298eeeb16d942dd5144e550731e6e29b6436e':
  avcenc: Initialize all memory allocated by the CBAVC_Malloc callback function
am a858aa96: Merge "avcenc: Remove redundant zero-initialization of allocated memory"

* commit 'a858aa963d2a7e767d0d8694e29cb6fe87c9ef9f':
  avcenc: Remove redundant zero-initialization of allocated memory
am efee0095: Merge "Correct ID3::StringSize calculation for UCS-2 data."

* commit 'efee009528f446542d51f1ce50e2189e8a2f71dd':
  Correct ID3::StringSize calculation for UCS-2 data.
am e28df5b9: Merge "Store correct time stamps in recorded mp4 files"

* commit 'e28df5b996af3480b457c7a9908dbb9d52ad8d7c':
  Store correct time stamps in recorded mp4 files
am c64a1787: Merge "Fix initialization of audio mixer track resources for MIPS."

* commit 'c64a178711bf7bb9b71d65a47156b34083311392':
  Fix initialization of audio mixer track resources for MIPS.
am 2001d2ac: Merge "MPEG2TSWriter: Write proper continuity counters for PAT and PMT"

* commit '2001d2ac01e36c13c1abda5f73b6404cba2648e1':
  MPEG2TSWriter: Write proper continuity counters for PAT and PMT
am 24893fef: Merge "MPEG2TSWriter: Write a proper CRC in PAT and PMT"

* commit '24893fef8e0f816a8a21749fa3eb9eed9173a0fd':
  MPEG2TSWriter: Write a proper CRC in PAT and PMT
am 5efa7bf9: Merge "amrnb: Fix audio distortion in an AMR-NB clip"

* commit '5efa7bf945f53c419501b0a4f9718962f24f0df5':
  amrnb: Fix audio distortion in an AMR-NB clip
am 98159acd: Merge "amrnb: Restart the p_xn pointer when retraversing the array on overflow"

* commit '98159acd68307bf0fcec40ae0fffc1a715517d1d':
  amrnb: Restart the p_xn pointer when retraversing the array on overflow
am 2c3d9b7b: Merge "MPEG2TSWriter: Correctly add padding using the adaptation field"

* commit '2c3d9b7b9e34c9122c0a568d6b1fb24404021f55':
  MPEG2TSWriter: Correctly add padding using the adaptation field