Merge "Un-drop support for pre-4.14 kernels."