Merge "Support VNDK ABI dump in JSON format"