Merge "Add framework-virtualization to combined_apis"