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

Change-Id: Ie2b8333e9fb79c500049c0ac30c735871161c110