Merge changes Ie0396d59,I75b2bade

* changes:
  Allow apexd to configure /sys/block/dm-
  Allow the kernel to access apexd file descriptors.