Merge "aboot: update command line in common code"