Merge "Fix missing AOSP copyright headers for more files" into honeycomb-mr1