Merge "build: tools: Add json collection of installed files with hashes." am: fe77369b50 am: 1ea9eacdae
am: b59ca9cd40  -s ours

Change-Id: I14269077334a14f5053917e54dce98f04aecddbd