Merge "Measure ASECs for forward-locked apps" into jb-dev