revert changes and use cm11 releasetools