Merge "Adjust APF interpreter tests to match APFv4" am: 05011abf27 am: e56afce9e9
am: 3bd37ea3c2

Change-Id: If59d48f39b4f8d622ac0f9362e1b3ff45bee1228