Some make file fixing

Related to d1c74734c8d9026b0f0c03f7382ca60165cec8c6

Change-Id: Ic3a6147f0615e79640ec9f567168f93219d34020