Merge "Remove alignment bits in between stack maps"