am 6b6687be: (-s ours) am 00392411: am e7ed68ad: Merge "libcutils: fs_config: Add folders normally created in init.rc"

* commit '6b6687bec97bb325f21fc9bfde8256430b55cc3c':