Merge "OMXNodeInstance: use a lock in freeNode" into lmp-dev
am: 288566faba  -s ours

Change-Id: Ia3e1ed7e8c123ee8c6e93a015fb3dad14a9c7d3b