merge upstream from omnirom:android-4.4