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

Change-Id: Iecbd3a6b8ce6a71776a93597100e94263c3b30ea