Merge "Remove a prehistoric fastboot hack."