am 9fbe9429: Merge remote-tracking branch \'goog/jb-dev-mako\' into jb-mr1-dev

* commit '9fbe9429':
  NuPlayer: Prevents creation of Video Decoder when we use Music Player
  Synchronize access to OMX class member variables
  Merge from jb-dev for "sample video corruption in MediaCodec mode." DO NOT MERGE
  libstagefright: dynamically load libstagefright_chromium_http
  Process EBD and FBD messages in ERROR state
  Add vendor specific output color format