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

Change-Id: Ic2f32ea4dd1e53539eba84134984bc6441810820