Revert AosonM12 defconfig setting which was causing bootloop
Merge branch 'master' of https://github.com/drums173/android_kernel_odys_neox_3.0.8