Merge "Change LicenseHtml search path from product_services -> system_ext"