Merge "Add legacy-align parameter to DmabufHeapAlloc()"