Revert moving lines to common

This lines should be specific because ${ro.hardware} for some reason is not being replaced with property
Merge branch 'cm-11.0' of https://github.com/TeamCanjica/android_device_samsung_codina into slimkat