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

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

Change-Id: I37b0784c883064b5f493d031c75b44eef2339e3c