Merge "audio HAL: reverse mutex locking order" into mnc-dev