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

Change-Id: Iafe90f7c758957d73aded6eee4533be8b5d12606