Merge "Fix Copyright Headers" into froyo