Merge "Fastbootd: General fixes and changes"