Fix CM and AOKP merging derps