Merge "Change build version from KEY_LIME_PIE to KITKAT" into klp-dev