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

Change-Id: I97206e4ec7baad1679f3a5b325a920ab7f8863c0