Revert "jf-common: de-unify variants"

This reverts commit 0bb85f9694fc864e08a6328871928d5c5eccc69f.

Conflicts:
	Android.mk
	BoardConfigCommon.mk

Better to use unified tree...

Change-Id: Id5cf2b2357a8d41af2474080e229cb35fe250aa3