Merge "Track rename of org.kxml to com.android.org.kxml 2"
am: 69a13aded0

Change-Id: Ib8c6e3d6c44e0c09b95ca8ad965083456764588b