Merge "img_alloc_helper: make align var unsigned"