Merge changes I4f6755fe,Ief9c44ee

* changes:
  Extend make_ext4fs() interface to allow callers to pass selabel_handle.
  Extend make_ext4fs to support setting SELinux security contexts in ext4 images.