bmx6/Makefile: use rebased dev-branch tip (again)