Merge tag 'v4.4.25' into linux-linaro-lsk-v4.4