am b7e6e8bb: Merge "Support to configure and build multiple custom images."

* commit 'b7e6e8bb6d00dc2677b297e548aff92f97066ab5':
  Support to configure and build multiple custom images.