Merge "Revert "API Lint: Enable for TestApi""