Merge "Rename org.kxml2 code to com.android.org.kxml2"