Merge "libexternal: clean up HDMI modes"