follow up change to hikari defconfig
follow up change to hikari defconfig
disable lz4 due to build error
enable lz4 back
updated nozomi defconfig to align with my hikari defconfig

Change-Id: I591c7e1960b809b56a81b285dbeb54c4c7b726e6
Merge pull request #1 from MrGezz/elite6

update aoba defconfig to align up with hikari
Merge pull request #2 from deedwar/elite6

merge