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

Change-Id: I19b764bec72b9fb307771b018aaeeca6da8043c4