Merge "Fix bug 6688060: breakage in AndroidCharacter.mirror"