Merge "Atheros 8337 support."