Merge branch 'omap-for-v4.12/dt-droid4-v2' into omap-for-v4.12/dt-v2