Merge branch 'XeroLiAOSP' of https://github.com/Xerolux/mako-kernel into XeroLiAOSP
Merge branch 'XeroLiAOSP' of https://github.com/Xerolux/mako-kernel into XeroLiAOSP