Merge in more makefile edits from repo:voltha-docs

Change-Id: Iba7f6e565b45c5e888a34bce295d8fada8ab2ce2
12 files changed