... used to build, since otherwise it'll break with "malformed object"
errors.  Alo replace now unused XCRUN variable.

Change-Id: I58a20c34f903b7a7acb46597d94243389e6b3842