Toolchain location update
Earlier cherry-pick fixup
Extra endif from earlier cherry-pick deleted
Derp... function removed from earlier cherry-pick fix by accident
Revert some changes from cherry pick that added comments but may have made other changes accidentally
Compilation fix re implicit declaration of function... Not needed
Compilation fix