(Merge 3.2) Issue #12016: Reindent decoders of HK and JP codecs