Merge "Remove api_lint_hook to fix rehook issue"