Change to use IsUnresolvedTypes. Bug: 22881413 (cherry picked from commit 168387df) Change-Id: Ic27b97b475b28a5bdf994ea5178767e0efb0e752