Merge "fastbootd: Remove metadata merging code." am: 43cb5db90a am: 23de076c1c
am: 23e67e3b1e

Change-Id: I92c78c14b763b88abf63ae4fc98bbeb9e564007d