Merge "vndk-def: Remove more unused code"