Revert moving lines to common

This lines should be specific because ${ro.hardware} for some reason is not being replaced with property