GitLab

Helps us to commit trivial makefile changes ahead of the larger
code merge.

Change-Id: I2710a664e3a39afead03fc617f04e432df7f8fea