am 231da079: Merge "fix [3389263] OMX.Nvidia.h264.decode fails to shutdown" into honeycomb

* commit '231da079c93664fa7d81c7e957990f17a6334b17':
  fix [3389263] OMX.Nvidia.h264.decode fails to shutdown