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

Change-Id: I227fd7f2ef394c13651c90e88b5a9e40df39e09c