Merge "vndk-def: Remove dead code."