Look up proto type definitions separately

Creating nested types will cause type collisions. Instead search
for the type separately. Also fixes an issue parsing sf traces
from Q.

Fixes: 156034870
Test: yarn run dev
Test: open sf trace from q
Change-Id: I3c2a283e56985bfee56633a5e914b83ac2a0cf3b
2 files changed