Changed framework/native and drivers/qcom/display to psx one
fixed derp
Merge remote-tracking branch 'upstream/android-4.3_r2.1' into android-4.3_r2.1

Remerging with upstream.
Import Kernel-Source

forked from CM
Merge remote-tracking branch 'upstream/android-4.3_r2.1' into android-4.3_r2.1
Second attempt to build Slimroms MMS