Merge branch 'linux-linaro-lsk-v4.9' into linux-linaro-lsk-v4.9-android

Signed-off-by: Amit Pundir <amit.pundir@linaro.org>