Merge "Add systrace method tags for measure and layout." into jb-dev