Marking qa-ok since this is Makefile and build script changes and it has passed a round or two of buildbot.
Marking qa-ok since this is Makefile and build script changes and it has passed a round or two of buildbot.