am 7a864af1: am aa112716: Merge "build_image: Set file system labels on disk images"

* commit '7a864af1b72a278d7e83f2f1f6ac6da587d658c8':
  build_image: Set file system labels on disk images