Merge "Remove unneeded call to all-makefiles-under"
am: 8367d36ae7

Change-Id: Ic6f286637703eca3c526ee582ea25f892d16d596