Merge "Revert "Add tools for updating NDK ABI dumps.""