Merge "Suport parsing hashtree and ecc data from avb" am: c4b5c59477 am: 08cf7e8032

Change-Id: I15036078f2fa713ac9affa60b01a18622e0e96b9