am 6b3bd5f3: Merge "Add prebuilt yasm"

* commit '6b3bd5f3f5cbc0fdfeae22b37d66ac3c811d02d8':
  Add prebuilt yasm