Use db.flavor_ instead of db.instance_type_

We are removing instance_type as a synonym for a flavor. This fixes that
for the db.ap.

Partially implements bp flavor-instance-type-dedup

Change-Id: Id41b3b86a7af476622c70415080f4982c267a646
Merge "Use db.flavor_ instead of db.instance_type_"