Merge remote-tracking branch 'origin/upstream/linux-linaro-lsk-v3.10-android+android...