Merge "OMXNodeInstance: use a lock around OMX::freeNode" into oc-dev