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

Change-Id: Ibf045a9f9b3169bd81330f0420501df1dc3007d9