Merge "Revert "[PM] Remove wear folder and the usage of xz-java"" into main