Merge "Run appcompat on vendor and product-services."