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

Change-Id: I32ecd374b63da1ff62def9d0945399a456909422