Merge "Merge "OMXNodeInstance: use a lock in freeNode" into lmp-dev am:...

Merge "Merge "OMXNodeInstance: use a lock in freeNode" into lmp-dev am: 288566fa  -s ours am: 2a5e425a am: 96c2fafc am: b9da9fc1 am: ee22f8a6 am: efd26f8a am: 2d073bdd am: f5eb536d am: 27bdac8e am: fab889e9 am: 44a79a8d am: bdbb3806 am: 102b970d am: d29ab2c5" into oc-mr1-dev-plus-aosp
am: c0305c34

Change-Id: Id40fd189adb80f7a54330a0920c498ee9931213a