Backport fixes needed to avoid use of VLAs which is not available
on clang/llvm
(From OE-Core rev: 57881c3dc68bd8697aaac7fa3587202121a042a4)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>