fix nfc and vibrator issues #2 (because of carelessness)

Change-Id: Ia2aa7ed70535a331e100514e94c8785e2f0653dc
fix baseband wakelocks #2

Change-Id: I8d12fbd700d8d72ef8a027a04678c10e06fd58dc