update makefiles

Change-Id: I8d1347fb8890d9ce155bc1deea618d1fc343d9be