[automerger skipped] Fix net tests for 32-bit kernel am: e57d074d -s ours am: a1bd780f -s ours am: 74ee46a7 -s ours Change-Id: I7f117081d85d709f2d8af261a9cbe1a84c8c5299