update for hikari
Merge branch 'eos' of github.com:OpenSEMC/android_kernel_sony_msm8x60 into eos

And adding hikari devconfig