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

Change-Id: I1fc820d770ecce37f607282445abd6f8b7b76056