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

* commit '6e24c9fc12d7ed177494d23e632bb174e4047e0b':
  Add locking around boot image generation.