Android 2.2.1 release 2
Merge "Fix copyright header for pvmediascanner.cpp" into froyo