Merge "Interpreter: fix build."
am: fea963e4ba

Change-Id: Ie415f8d81e37e4e2a8007f2c13d9a382312bc421