Merge "DO NOT MERGE ANYWHERE - improve audio effect framwework thread safety am: b37f28adae  -s ours am: b5d31fca16  -s ours am: e6bb1bdd21  -s ours am: d7848ce659  -s ours am: 9a20310d58  -s ours" into nyc-mr2-dev-plus-aosp