Merge "Change default arch for banchan to arm64" into tm-mainline-prod