Merge "Revert "Add Android Runtime APEX directories to Bionic search paths.""