Merge "Apilint: lint for URL/URI"
am: 1d50b63cee

Change-Id: I4c1845769e82d3bae55678480372dcde69153b02