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

* commit '5a1c89e94ee4a96e31bd66f01a27c2c75cba4065':
  fs_config: use libcutils and libselinux shared libraries