Bump to 6.0.3.3

Change-Id: I089fad25002a28cc5b368288c5bb34c37f9752bc
Merge branch 'cm-10.1' into martincz