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

Change-Id: Ic9de7ca0f8269de190570554348053c4f7976195