Fix building custom recovery with userdebug

Credit Koushik Dutta

Change-Id: I41f1a91849f3aab435a3398696149afce68d8708
Merge "Fix building custom recovery with userdebug" into android-4.3
Merge branch 'android-4.3' of github.com:omnirom/android_build into omni-4.3