Merge "Add better index checks for AndroidCharacter.mirror"