Merge "cronet: re-enable lint"