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

Change-Id: I8b84cbaceae238201ef65cfd4168def364e66d4e