Merge "KLP/KitKat is now API 19." into klp-dev