Google merges Android, hardware teams