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

* commit '968fa2eecc668bb07d8eaecd5293f6a3a527f957':