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

Change-Id: I92766ae9c6c992add4a96a9fe4d74451b6389f02