Merge branch 'android-4.14-stable' of https://android.googlesource.com/kernel/common into HEAD

Change-Id: Ic150fb28df8a367beb420de6e91e9914f26b5ecb