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

Change-Id: I27966dd0d709e66a624ee1fc1b5045132a24385b