m7spr: update for aosp