Merge "Remove unneeded call to all-makefiles-under"