Don't silently fail if we can't build deps.mk.
merge default into bug25537
merge bug25537 into default