DO NOT MERGE - improve audio effect framwework thread safety am: 84c392104e  -s ours
am: 5d5f9cd28a

Change-Id: I3f732f9e0c346c0e7989e22401062011ef7c7ed2