Merge "vndk-def: Revise vdex file parser"