Merge "Revert "Add speedtest to google platform build""