Merge "Remove clone from x86 android-12 to 16"