Merge "Support loading VNDK ABI dump in JSON format"
am: 868cdf5cb2

Change-Id: Ifa88bd74b3500bab01386be447dd3decf4a97621