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

Change-Id: I726a8cf5bde267b8ef881972f19f601c405e827f