am fcd14f13: am 9fabbbfb: Merge "Do not call libcutils property_set in init through libfs_mgr"

* commit 'fcd14f13a1e05bc1958bfeaba95678b9bf4b121e':
  Do not call libcutils property_set in init through libfs_mgr