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

Change-Id: I605710d653a899c3dad6bfcd6ae3ecd4e326b5b6