Merge branch 'upstream/linaro.38' into linaro-android.38