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

Change-Id: I40c0b490111d73de293a734ca8f0182a33a9fa06