Import Google Services, Clean up the debug tool for builds