Merge tag 'v3.10.2' into linux-linaro-lsk-android

This is the 3.10.2 stable release