Merge "Add system_ext/apex/*/bin to fs_config" am: d4502115ad am: 69aa1e0b2c

Change-Id: Ie288957240c9e8c431870030c79c0fd215fadec2