Merge "Update linker configuration when loading apex"