Merge "liboverlay: explicitly set alignment to 1M for secure buffers"