Merge "vndk-def: Remove debug code."