Merge "Remove the dead #include's in verifier.cpp." am: 64d25024b9
am: b2617e882e

Change-Id: I8b99bd307e38e4dc4a477bf3ae2bd89495434507