am 1e49340a: Merge change 24320 into eclair

Merge commit '1e49340a8249b147a2bb4f12e242ac5aedbddece' into eclair-plus-aosp

* commit '1e49340a8249b147a2bb4f12e242ac5aedbddece':
  Simplify networking code initialization using static structures instead of code.