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

Change-Id: Ic0a17b1de1483de2f12a64d6b159d149abe64923