Revert "Merge commit 'refs/changes/18/32018/2' of http://review.cyanogenmod.org/CyanogenMod/android_build into cm-10.1"

This reverts commit b6b3d7b5adc890dbe7a51e5d03176b08b8497ce1, reversing
changes made to 92e8e39fab694b41d66d2aebc54cc75e2415e861.
Revert "Merge commit 'refs/changes/12/32012/1' of http://review.cyanogenmod.org/CyanogenMod/android_build into cm-10.1"

This reverts commit 92e8e39fab694b41d66d2aebc54cc75e2415e861, reversing
changes made to eae3efa270068e24a2afa0e25ab20bdeef02856f.