Merge "Fix uses of all-subdir-makefiles"