Merge "Don't pass empty arguments to ninja" am: f8acdc50fa am: d4aba70550
am: ac15f41714

Change-Id: I7e3ccee98fa04fbb8887d5dacd8f13e8341d6c05