Merge "Fix a lock issue in AudioPortEventHandler" am: 0985eea389 am: 41c9e7092e am: 4b98ce6898 am: bb3c59e776
am: 741db323d9

Change-Id: I81e6ebc76cdc82e0622543bb8972beeae4bf03d1