DO NOT MERGE Cherry-pick: Move v4 support base dir to donut to match master.

Change-Id: I18c15cf22c20c00d8e5780a90485f9fca4894d2f
3 files changed