Merge "core: QCOMs revenge" into android-4.4