Reverted changes to external_bluetooth and external_oprofile