mGerrit: Bump version to v2.05.004 for release

Fix some build issues

Change-Id: I2890cf9c7c5cf55e30b58edcdfbfbf8cdb6a5d28