DO NOT MERGE - improve audio effect framwework thread safety am: 7da83aadf4 am: 5717bb1acb  -s ours am: 199484a558 am: fff4a6aff9 am: c8fbf1a97c am: 8e24a55a3c  -s ours am: 76f5a383ea
am: 6e300c3a99

Change-Id: Ie412fe90bc50762933ad6724d854956c286c2f58