Use master branch of d-g fork

Change-Id: I3e7c45b44da36ee5ebe2ad2303e2e808b30a87ff