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

Change-Id: Iac5a843c1476dd96029956bba7e68aed538d0c52