Remove broken make constructs
am: e239c8e124

Change-Id: I1514c90e4b2eaab22096f64138646414a1be51f8