Merge "IOMX: consolidate createInputSurface APIs"