Merge branch 'android-4.4' of https://github.com/omnirom/android_build into android-4.4