Reconcile with jb-mr1-release

Change-Id: Ic0cdae375d796efb3dc07956e03fea062557b765
am c620cbd7: Refactoring how the box table entries are stored in MPEG4Writer

* commit 'c620cbd7f8dc75f6819e2b862d3c09970560bc63':
  Refactoring how the box table entries are stored in MPEG4Writer
Sync with jb-mr1-dev

Change-Id: I5bd4d44e0e33d28487c04a27652469697478ecd4
Reconcile with jb-mr1-release - do not merge

Change-Id: I2c45a6566f7eff107fa320d407fce712616e6801
am 836b81f3: Camera2: Improve threading safety

* commit '836b81f3c5a5bacb800f698f90ded6bd6e6bc5ce':
  Camera2: Improve threading safety
am 428b77a2: Camera2: Improve formatting of debugging dump

* commit '428b77a2b94b74665a47375b3fdb893b98d71269':
  Camera2: Improve formatting of debugging dump
am 5665fde6: Merge "Start adding support for multiple record tracks" into jb-mr1-dev

* commit '5665fde6d4520c8e6cec81a4e1e9c86f1537f689':
  Start adding support for multiple record tracks
am 3788a393: Merge "Allows MediaMetadataRetriever to retrieve video rotation angle" into jb-mr1-dev

* commit '3788a393bbcadebf38ac01ef9b2ecc46f07db011':
  Allows MediaMetadataRetriever to retrieve video rotation angle
am 44cda3a4: Don\'t wait for presentation complete if terminated

* commit '44cda3a4e7ca3de0db9cb49145def3803b03ebb4':
  Don't wait for presentation complete if terminated
Shutter sound is heard at the end of the recorded video

On fast hardware, which is more common, the shutter sound is
played and recorded before video recording is stopped.

Before we call play shutter sound before calling stop recording.
With this fix we call play shutter sound after calling stop recording.

Change-Id: I06a3e65fd2700f1d2457fea5ff0f64500eac436f
am 9007619d: Merge "Shutter sound is heard at the end of the recorded video" into jb-mr1-dev

* commit '9007619d1f786a75dae0fff31feadbf9aed9cfb8':
  Shutter sound is heard at the end of the recorded video
am 2f0632f1: Adjust fire time of a timed text message before firing it.

* commit '2f0632f12cd02b0350918720443c888b48f4417b':
  Adjust fire time of a timed text message before firing it.
am bb6bc849: Adds resume() function

* commit 'bb6bc8491fe819f96e1902e56694715cb110ce94':
  Adds resume() function
am 6472badc: Fix: status checking in TimedTextDriver.

* commit '6472badc497a9e748411f8c8c9ed5d83ef335a85':
  Fix: status checking in TimedTextDriver.
am c9729ca1: Unifying TimedTextDriver\'s resume() and start().

* commit 'c9729ca1cb1760da836e293e3ed7a82f769f3e07':
  Unifying TimedTextDriver's resume() and start().
Reconcile with jb-mr1-release - do not merge

Change-Id: I6214770f9936bcdde41fdb10e61e79da1ef675ed
am 9cb20d4a: am a9ab66c5: (-s ours) am ffd99cb7: Merge "Shutter sound is heard at the end of the recorded video"

* commit '9cb20d4a41eb84bfab7f9f0d0829393f378583f4':
  Shutter sound is heard at the end of the recorded video
am ac9b9600: Merge "Allocate buffers before calling start on its source in OMXCodec::start() for encoder case" into jb-mr1-dev

* commit 'ac9b96003da5dad9ae6fc8d054d7b24ef24693fe':
  Allocate buffers before calling start on its source in OMXCodec::start() for encoder case
am 4a76bcea: Merge "Camera2: Check PIDs to ensure camera exclusive access." into jb-mr1-dev

* commit '4a76bcea7a23356185c4fa9491d5a73256b80cd0':
  Camera2: Check PIDs to ensure camera exclusive access.
am 1bf1c000: Merge "Camera2: Minor logging updates." into jb-mr1-dev

* commit '1bf1c000be916b5e3388ef9039beedda01fa2bdd':
  Camera2: Minor logging updates.