Merge "Only look at vdex related access flags for class/fields/methods." am: 8a31bb939f
am: 203617fa84

Change-Id: I76db3170cafc329577a209444ca30b76ad136911