Remove conflicting overlay
add TARGET_PRODUCT := arm
Merge branch 'jb-camera' of https://github.com/shumashv1/android_device_hp_tenderloin into jb-camera

Conflicts:
	BoardConfig.mk