Merge branch 'upstream/linaro-3.1' into linaro-android-3.1-agreen-rebase