Merge branch 'omap-for-v5.5/droid4' into omap-for-v5.5/dt