Merge "Add new resources trace, also trace apk dex loading." into jb-mr2-dev