Merge "Fix an out-of-bounds read in assoc_next." am: 4a86774d36 am: 64d8ff4eef

Original change: https://android-review.googlesource.com/c/device/linaro/dragonboard/+/1468267

Change-Id: I98bdfe2d14bf7a73b883b48156f5c78176f61382