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

Change-Id: I49e998be2344a0fbd23c1b8accbf64549702f750