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