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

Change-Id: Id3fbb006674ba3cbce270bc997a70a10ea354b38