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