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

Change-Id: I6b7b1d889960224ade563a49f69ebd11b61514a0