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

Change-Id: Ifd7a43d6171bbe4670639273dcc65492d67e6289