Merge "vndk-def: Fix vndk-ext computation."