d2/jf: Enable overlays

* Fix fw/base typo
* Enable config_deviceHardwareKeys with value of 7 (home,back,menu)

Change-Id: I42e470857e0d08dbd0e897f9d2f6b62c4b24dcc0
Signed-off-by: Brandon McAnsh <brandon.mcansh@gmail.com>
Merge "d2/jf: Enable overlays" into kitkat
aokp: Add XPeria ZR to official nightlies

Change-Id: I0d0c43159dc9e035156f3c679fe9a629fbef5223
Signed-off-by: Arnav Gupta <championswimmer@aokp.co>
Merge "aokp: Add XPeria ZR to official nightlies" into kitkat
Merge remote-tracking branch 'cm/kitkat' into kitkat