Merge "Fix package names and delete duplicated java files in android.text" into lmp-dev