Merge "Fix typo in EastAsianWidth javadoc" into froyo