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

* commit 'b4bb346e4cddddc80ec654571776f699742065c8':