Merge "DO NOT MERGE - improve audio effect framwework thread safety am:...

Merge "DO NOT MERGE - improve audio effect framwework thread safety am: b47a5ab1 am: 26cf2f4d am: 73a15296  -s ours am: 21d6eafd  -s ours am: 6c5deab4 am: 96858201  -s ours am: 6608edda am: c6a7a423 am: d1b62938 am: 1771044f  -s ours am: 9ddb80f8 am: 58a605ff am: b132ba60 am: 482341fa am: 6896c4af" into nyc-mr2-dev-plus-aosp