Merge "Fix LDFLAGS for arm and x86"