Merge "fastboot: allow automatic detection of super location"