Merge "Add atrace to core.mk" into jb-dev