Do not convert the variable name resembling override setups passed to makefile
Fix some of missed overrides

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Cc: Martin Jansa <Martin.Jansa@gmail.com>