Merge "Update support lib to match final KitKat API version." into klp-dev