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

Change-Id: I5223b955c9641018fd9dd88aca62782f62fa54df