Merge "Support VNDK ABI dump in JSON format"
am: d3b65417c2

Change-Id: I486e698da7aa169e6e0229c0301e670ec68e75f3