Merge "Make Hdmi test run on presubmit"