Update, bring inline with AOKP, add m7 device