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

Change-Id: I099773e4ac5fb7c8bb8dfda44d936ae0a4c43d25