Merge "Test SIOCKILLADDR on non-empty addresses too." am: fa61997537
am: e2f9e698bd

* commit 'e2f9e698bd0c8ae20d2673d477a57a837d914044':
  Test SIOCKILLADDR on non-empty addresses too.