Merge commit '4ee476ef94f7834c18ee378c788abcdb0728954f' * commit '4ee476ef94f7834c18ee378c788abcdb0728954f': Fix a problem in which Android custom fields are not emitted correctly in non-Ascii languages.
Merge commit '4ee476ef94f7834c18ee378c788abcdb0728954f' * commit '4ee476ef94f7834c18ee378c788abcdb0728954f': Fix a problem in which Android custom fields are not emitted correctly in non-Ascii languages.