Merge "Support loading VNDK ABI dump in JSON format"