Samsung i9300 Update 11

Change-Id: I7f6dbdd97e3ed66634bf123d43224a79524c04e9
Merge branch 'cm-11.0' into martincz