Merge "Rename logtag for clarity." into froyo