Merge "Move kxml2 to prebuilts/misc"