Merge "Add thermal shutdown.  If battery temp >= 68C." into froyo