am 573399d1: Merge "Move v4 support base dir to donut to match master." into klp-modular-dev

* commit '573399d173311208f8933ed41df2df4a049259a3':
  Move v4 support base dir to donut to match master.