am 320a01d5: Merge "Revert "Load libraries in breadth-first order""

* commit '320a01d51693408dad859094ca52e5f315ff1d15':
  Revert "Load libraries in breadth-first order"