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

Change-Id: Ic0767319da638b9692b2b2743d2071cb7dcd1563