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

Change-Id: Idcfec2fca38bfffe8d2e72b1eab05057b9c5a466