Compare only slim version in update check

If device name changes, this won't affect update notifications anymore

PS2: slight code reorganization
Change-Id: I237372a719a5073af640225cbc5f438e5a2c95f2
Merge "Compare only slim version in update check" into jb4.2