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

Change-Id: I8c86f95b8f3bdb4c20372207c55bffe9a43b5dbb