Revert "Revert "Merge branch of Ganster41 into ics""

This reverts commit d73d538a0425f5087b4eef9be78ac29de1d68382.

Conflicts:

	media/libstagefright/colorconversion/SoftwareRenderer.cpp