am 7378e2ec: am 6099df8c: Merge "Remove ISA from boot image name."

* commit '7378e2ec096273f51c5f155b5f9859adc5b1003d':
  Remove ISA from boot image name.