am 8fc9bc57: Merge "Disable certain kernel configuration options in net_test."

* commit '8fc9bc570474c7f76638529e2b98248775c0d5d8':
  Disable certain kernel configuration options in net_test.