Merge "OMXNodeInstance: use a lock around OMX::freeNode" into oc-dev am: 1e79b0c156
am: 648703351f

Change-Id: I08dd8a52ec12ebaa6917f9df370d781d60a76c1a