DO NOT MERGE - improve audio effect framwework thread safety am: 7da83aadf4
am: 5717bb1acb  -s ours

Change-Id: I52dedef569daef7a901ac924575b04c06e431ee0