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

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