m7-common: update for aosp