Merge "Revert "Don't include linux_bionic variants to platform-tools"" into main