am 2b63384b: Merge "Serialize calls to getFrameAtTime in the mediaserver" into mnc-dev

* commit '2b63384b6d338f2c3320818a698c3f9d6221fe5d':
  Serialize calls to getFrameAtTime in the mediaserver