Merge branch 'master' into vanir
Merge branch 'linaro_android_4.4' into vanir+aosp