Bump to 6.0.3.9

Change-Id: I5637e796e4dc65ae527b0b1984b295d69ccc0707
Merge branch 'cm-10.2' into martincz