Merge "cronet import: remove unwanted third-party dirs as per aosp/2469560"