Merge "Revert "Add Android Runtime APEX lib directories to the system linker configuration.""