Merge "aboot: check if cmdline is NULL before using it"