Merge "Create a folder to store method traces activated with -Xmethod-trace" am: 7605a56fbc
am: 5d1a9688b8

* commit '5d1a9688b8623c12a00b76e2256f5b418aa1dace':
  Create a folder to store method traces activated with -Xmethod-trace