am 970bad67: am be368de7: Merge "Fix missing AOSP copyright headers for more files" into honeycomb-mr1

* commit '970bad677585b3cba1ff1b48db9040c2005bd907':
  Fix missing AOSP copyright headers for more files