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

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

Change-Id: I553c6f86cca9716918303f5765155a188beab359