Revert logging changes for empty netbpfload prog

Recent ConnectivityService does not use the empty netbpfload program
used for the logging in these changes. Revert changes that were added
temporarily for merge conflict purposes.

This reverts commit 1c351b2c4aed13b6169cbb107f7a1488637dbdd5.
This reverts commit 4bf2d4e8cd077d012d01ede5e5dfba222f4ee939.
This reverts commit 295746d2bfb84f82c2528b1315b62f9224f57474.

Change-Id: Ifec055938b4a1f684299662c1661a8ae13b0aedb
1 file changed