Merge "aboot: Cleanup atag creation logic."