Merge "vndk-def: Remove dead code."
am: e2a5490634

Change-Id: I9b3fa53fb9923170593a664b236ed986a8b70381