Merge "Add mutex-based protection mechanism to the HFP JNI layer"