[automerger skipped] Fix net tests for 32-bit kernel am: e57d074dc5  -s ours
am: a1bd780fb5  -s ours

Change-Id: I9757b98c22ec806028cfa596597283248f896e23