Update makefiles for hwtypes.h am: 561b602a99
am: b350bbe7b8

Change-Id: I576373180f51c1657547ca0290549acf203c3514