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