am 608f63ba: Merge "Add locking around boot image generation."

* commit '608f63bae4ed0dc0cd6462d0df3d15c28f37f0b2':
  Add locking around boot image generation.