Merge "Allow Conformance tests to verify userspace fastboot." am: 4aa42b46c9 am: 5b5c3e9a6c
am: f5f6a65336

Change-Id: I66e9b467b90d9532c9150c286eb2b62e215d301a