Cleanup for building with AOKP