Merge "fastboot: Mount /metadata before overlayfs teardown." am: 38f3706ab3 am: d12410d2f9

Change-Id: I51d74369288edd7935ea655eab5e1c9f329c7e00