Merge "fs_config: add bin paths of flattened apexes"