Fix init.d support (2/2)
Commit (1/2) is in system/core
Revert "Inherit version.mk at end of Crossbones device build"

This reverts commit 0e8c191b3c0f35893c2646233fe258221f578d1c.
Revert "Change how Crossbones version gets set"

This reverts commit 2c0eee8ccb9ad0d661e1ec2dc4c477f2ad15da04.
Fix some build.prop overrides
Mainly to fix output in Settings > About Phone

BUILD_DISPLAY_ID (ro.build.display.id)
ro.modversion