Merge "Fix GSUB ccmp rule to use non-spacing marks." into lmp-dev