Bump version to 6.0.3.1

Change-Id: I01f94f18e240bf9580f118c6cb30ad702fb37e80
Merge remote-tracking branch 'cm/cm-10.1' into cm-10.1