Merge "Add logic to preopt both archs for SDK libs"