Merge "Fix exclusion of builtin types in linked dump."
am: 8d4969d163

Change-Id: I98ab844c8707dd8081479bdc70b89d22a3d37c36