Merge "Track rename of org.kxml to com.android.org.kxml"
am: dd64992fcd

Change-Id: I8e6be0e9d55c07c4ed0283747457313661edbb64