Merge "Fix aarch64 image naming in parser"