Broke method_verifier_test and image_test. Bug: 31000839 This reverts commit 132eb433. Change-Id: I85923e6bdb3e76f54978658aad816d4c79fc339e