Merge "omxvts: misplaced lock can cause race condition" into oc-mr1-dev
am: 99c319f781

Change-Id: I151636a841c11310880601db6533d21ab0d8f7c0