update to latest cm11 changes as of 18 Jul 2014