Merge "vndk-def: Remove more unused code"
am: e857fab89a

Change-Id: I3b4c312f8d5b220d648e45cbe86efc015b8262a8