Merge "More instrumentation to track down the hardware decoder not shutting down bug." into honeycomb