Merge remote-tracking branch 'origin/upstream/android-common-3.10' into linux-linaro...