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

Change-Id: Ifc8f543e73365ec69e3517328b08d448aa102ad5