am 54c1d36e: am 5a1c89e9: am 36fb373a: Merge "fs_config: use libcutils and libselinux shared libraries"

* commit '54c1d36eaee59c62a652b071bdec9e71c40002ae':
  fs_config: use libcutils and libselinux shared libraries