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

* commit '15fed390c44972932f6dd7ce3bef1004e8b98b61':
  Add new resources trace, also trace apk dex loading.