Merge "apexd: create new hashtree during pre-reboot verification"