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