am 92b12a8a: Revert "Rename modules to avoid build breakage temporarily"
am 92b12a8a: Revert "Rename modules to avoid build breakage temporarily"

* commit '92b12a8a5d5b74d31b3dbbd3aaaa6f3984a51f24':
  Revert "Rename modules to avoid build breakage temporarily"

google/conscrypt,google/conscrypt,google/conscrypt,google/conscrypt,google/conscrypt,google/conscrypt