Revert "Bacon from kitkat merger!"

Reverts VentureROM-Legacy/android_device_oppo_msm8974-common#6