Merge "cm: Update Android version in changelog" into cm-10.1