further cleanup of cyanogen stuff for build versioning, replace with lollipop branch style versioning