Merge "Ensure stack maps are 4 byte aligned."