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

Change-Id: I258ed67061952467cf81ee69b58d2f68c7f337e1