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

Change-Id: Ie28f5184ccd3b5185378e58cd8a4ff785b35e8ce