make shit awesome

Change-Id: I37f328bb9f6c5cc5a1faffc45f09bc0d1db0b445
Fix build with AOKP f_b changes

Change-Id: I9ebe20194570775cdfec4d067ccc471fd52f36d3