Merge "[PM] Force multi-arch app native libs match natively ABIs" into main