Fixes https://github.com/AndyCGYan/lineage_build_unified/issues/12, as well as obsoleting 2 "fixes" from earlier