Merge "[PM] Compile libs for both archs" into main