REVERT: Generic Blacklist (4/5) Fix

CM's Generic Blacklist is having issues being incorporated with ORCA using AOSP Framwork_Base and other AOSP source code. We are currently trying to work this issue out, in the mean time we are continuing to manage Orca 3 based less on AOKP, CM, PA and more so AOSP for speed and functionality.