Cleanup for AOKP merge