resolved conflicts for merge of 017649d6 to klp-modular-dev

Conflicts:
	modules/Android.mk

Change-Id: I6b84d2320be98b6af1f0cab729a917cf84cd9524

diff --cc modules/Android.mk
index 1935b11,de41f6f..07fa5ee
--- 1/modules/Android.mk
--- 2/modules/Android.mk
+++ b/modules/Android.mk
@@@ -1,3 -1,3 +1,3 @@@
  hardware_modules := gralloc hwcomposer audio nfc nfc-nci local_time \
-       power usbaudio audio_remote_submix camera consumerir sensors
 -      power usbaudio audio_remote_submix camera consumerir vibrator
++      power usbaudio audio_remote_submix camera consumerir sensors vibrator
  include $(call all-named-subdir-makefiles,$(hardware_modules))