Merge "Verify that root digest of hashtree matches the one of APEX"
am: 9caccb2675

Change-Id: I11b4d4be1ff43ff5dca743109c001b81902984ff