Avoid redundant $(builddir) based paths causing problems
Improve skeleton for the ARM64 injection