Replace patches with picks [2/2]
Revert "Add build patch"

We don't need to revert it anymore: https://github.com/CyanogenMod/android_build/commit/651987c5f2f78207edebdd821d1700a0464fdfb5