Merge "vndk-def: Implement latest VNDK heuristics."