update to aozp (see this if .mk or vendor conflicts