Merge "Add missing copyright headers to a couple of files" into honeycomb-mr1