Merge "Revert "Load libraries in breadth-first order""