DO NOT MERGE ANYWHERE - improve audio effect framwework thread safety am: b37f28adae  -s ours
am: b5d31fca16  -s ours

Change-Id: I2bca0d14033adf930ca164c1ce80a425b180c665