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

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

Change-Id: Ie4647f73e693fb9241032cb17576d90e9a5ec1bb