Merge "build_abi.sh: Comment unset ABI_DEFINITION for build.sh"