Merge "Track rename of org.kxml to com.android.org.kxml 2"