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

Change-Id: I78cf17e2add443bc9591dda53b44d4edea71e860