merge back no-audio hdmi and argus

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>