Merge "Continue using the real make if -C is used" am: 218a0c0c70
am: 56a2bb9ec9

Change-Id: Idd579c83cc58ed2ead8d327d3f6afaaf710c9a1e