Merge "fs_config: add bin paths of flattened apexes" am: 529ace17 am:...

Merge "fs_config: add bin paths of flattened apexes" am: 529ace17 am: 00fa8e7d am: e9b3d137 am: faafdd2f

Original change: https://android-review.googlesource.com/c/platform/system/core/+/1432791

Change-Id: I9776514b8157a5c0fd89a6906a46430a75d86be1