am 45f1f86e: am f0fba380: Merge "A flush of a video decoder connected to a native window must reclaim" into jb-mr2-dev

* commit '45f1f86eb97356b73811fc4d70af437c55a86dd7':
  A flush of a video decoder connected to a native window must reclaim