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

Change-Id: I3629875f49d65f853e20f95e354cbbe692ae1bc7