Update from AOKP

I hope this fixes some build errors I´m currently facing