Merge "fix unit test for AtraceLegacyAgent"