Merge "vndk-def: Remove debug code."
am: 9041b78e0e

Change-Id: I0898cdea51c1991a065beab4b8d378f813704eba