Merge "Convert the sparse_hash_ctx to the HashTreeBuilder class"
am: f444ef7b4f

Change-Id: Idef89036c4dd47283f264faf13dcef0799946018