Merge "Set --ninja_suffix based on make/mm/mmm targets"