Merge "Update makefiles (vibrator open)." into oc-dr1-dev am: 8dc55df186
am: 75509e4e94

Change-Id: Id31dc0d2ca241a13440118f3c2d1c42ab7f09adb