Merge "Revert^2 "Revert "Revert "Revert "cronet 121_0_6167_71: remove htt..."" into main