am 9f1b9bb7: (-s ours) am 5e7b21bb: Merge "build: wildcard isn\'t guaranteed to be sorted"

* commit '9f1b9bb71019b9a773d847cec6f10c198cd6c459':