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

Change-Id: I643c6f868bff26717c324c95fbc1b22c212d5bad