Update changelog and contributors list

same as http://review.cyanogenmod.org/#/c/55124/

Change-Id: Ibb46d44f63752b1f18dd6ca1fceaf6df61b8aa3a
merge CyanogenMod

Change-Id: I35f8de790ae06661c52c0681042d2b2de4f72e1b