Rename/Add hybrid confs

This adds a conf for XHDPI devices that have no navbars like the Jewel (EVO LTE) and fixes the original XHDPI one.
It also corrects the jewel.mk to inherit this one instead of the default XHDPI one

Change-Id: I6888d3170da37ad3dfebcd0a5f35357194087e0f