am fa72a9ea: Merge "Declare VersionCodes.KITKAT_WATCH." into klp-modular-dev

* commit 'fa72a9eaae6170e65d9ba72720ee7b0d752f8847':
  Declare VersionCodes.KITKAT_WATCH.