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