Resolve redirects in EntityInfoBuilder

Bug: 66972
Change-Id: Id88b9bc824ab30cfb02f7628508f9678457d92f4