Merge "active_map_test: remove unused VP9_FACTORY define"