AI 144929: Manual integration of 144925.
  The auto-merger doesn't specify "-d", and it got hung up on
  out/InterpAsm-armv4.S.

Automated import of CL 144929
13 files changed