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

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