Merge "Add KDDI/Softbank to available Shift_Jis mapping."