Revert "Merge branch 'kitkat' of https://github.com/CAF-AOSP/android_build into caf"

This reverts commit 74727dd611b6a659e10450d034050365fa837985, reversing
changes made to 501fae5a0c581545deee8ad6778a43772a3bc991.