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

Change-Id: I0e610da707f2988f441eb86d5b55f6d9088feec6