Merge "apexd: create new hashtree during pre-reboot verification" am: 39e98a263b am: 7dd7e757f5 am: 8f0c2386b2

Change-Id: I2883251b3efd56e536f3f4ed8651852113b3eb92