Adapt to upstream changes.

Test: mma
Test: ./run_tests.py --bitness 64
Bug: None
Change-Id: I2f181c661253dffad5325c92c5fd4c05e741850f
4 files changed