Merge "Linux 3.0.67" into jellybean