Revert "Add Vanir build.prop tweaks"

This reverts commit 6421817829ec8d02f2ca85468b1e600fa5377af5.