Log Message:
Consolidate patch-ac and -ad into one patch file, as they patch the
same file (patch-ad with a weird path). Fixes problem seen in bulk
build.