Merge "Update the api-version.xml file to reflect KitKat recent changes" into klp-dev