Merge "Deprecate android.text.AndroidCharacter"