update makefiles for no types
am: 76e4d108d0

Change-Id: I103d27450fd5cd8062634ed5106f0576af39e3c3