Merge "Enable R8 on apache-xml." into main