Merge "Fix a lock issue in AudioPortEventHandler" am: 0985eea3 am: 41c9e709 am: 4b98ce68 am: bb3c59e7 am: 741db323 Change-Id: I81e6ebc76cdc82e0622543bb8972beeae4bf03d1