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

Change-Id: I53a33754367c0d4d11fbdc62fe83f2d9995d0bca