Merge "Declare VersionCodes.KITKAT_WATCH." into klp-modular-dev