Merge "aom_mem,align_addr: use ~ to create mask" into nextgenv2