Merge "Fix sdkcommon/lint API usage in ADT."