Merge "Revert "API: enable API lint on public and system APIs""