Merge "vndk-def: Add symbol data in VTool" am: f194748c7b
am: 74a35e6390

Change-Id: I0d62489fdfc847e40348be65bcba8337ce400da3