Merge "fastbootd: Add is-userspace variable." am: 6d5b931466
am: 2f1e709145

Change-Id: I2ff3c8daa9a6e7a3948bc331baa9a9028e7b9f94