Merge "ART: More header cleanup - method_verifier.h"