Android m preview 1
Merge "fix unit test for AtraceLegacyAgent"