update makefiles for no types am: 76e4d108d0 am: f3b866024c
am: b80d112130

Change-Id: I8c2fb489c9c9e5e947be65c2f36fc5022f9fefe9