Android 2.2 release 1.1
Merge "Fix copyright header for pvmediascanner.cpp" into froyo