Merge "Remove unneeded call to all-makefiles-under"
am: 7c8fd7bceb

Change-Id: I410ded4ea3bf451907d2a5c1dd1ccfa7c83114d5