Change-Id: I2da9cd5da48ae97e770bccfd1233bcc70b484688 (cherry picked from aom: 83c95f5 aom_mem: Refactor code)