This reverts the Android.bp changes in commit
bba8ec0d43.
Reason for revert: This broke ConnectivityServiceTest (https://android-build.googleplex.com/builds/tests/view?invocationId=I90700009364410436&testResultId=TR01525128446370769)
A full revert has a merge conflict in the other file, and is likely
not necessary to fix the failure.
Change-Id: Icc0c2500590a6b936016574be4f234b9f748cb80