cronet: merge cronet TEST_MAPPING into connectivity TEST_MAPPING

In addition, we may want an import for external/cronet. (Though that
directory isn't currently available in tm-mainline-prod, so that could
potentially cause issues).

Test: TH
Change-Id: I61734094d3b2f92a2d6d87b221b11ae68e81f270
2 files changed