Merge "app: aboot: Enable erase and logical block size variable"