Preliminary fixes to build with AOKP source

probably not last