[OS-BUILD PATCH] Revert "Merge branch 'unstripped-no_alu32' into 'os-build'"