Merge "Remove TransportManager from Robolectric android jars"