am ff119e74: am 6615defd: Make sure the OMX callback thread is properly...
am ff119e74: am 6615defd: Make sure the OMX callback thread is properly shutdown after the node goes away.
Merge commit 'ff119e74'
* commit 'ff119e74':
Make sure the OMX callback thread is properly shutdown after the node goes away.