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

Change-Id: I92c0e044163c4ff1c5bd0a410b5483176293337c