Merge "Have buildbot-build.sh create dummy hidden API lists"