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

Change-Id: Ifc97a03b7bd1f4f7174e7f4f8f5c474bbb1c10d8