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

* commit '36a382814099d1a4efeacb9be8bb8dd8ad1e2587':
  Disable certain kernel configuration options in net_test.