am a2981544: (-s ours) am 592f0b0c: Merge "build: wildcard isn\'t guaranteed to be sorted"

* commit 'a2981544ac2f64fcf942881362057bf81e9a195e':