[automerger skipped] Merge "Fix kernel net tests fail in user build" am: d55cec31 am: 4617b7e9
am: 6e096b60 -s ours
am skip reason: change_id I39d0b0141ef51c6f16052ffc785d1d2f523cf11f with SHA1 bed1c488 is in history
Change-Id: I1b1a444f0eb80e012665a72e1dfd688e61a19fcc