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

Change-Id: Id5a3cb0ee7009dbc43d74b614e19a09f2bc1ef26