Merge "vndk-def: Add several workarounds to dataset tool"
am: 0dc0ffb7d8

Change-Id: Ifc58ac4922a2fd8b9e350ed5019abbf1e618e9f3