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

Change-Id: Ib0958f28503165312d7a6b65efa0784c66d72389