Merge "Adjust APF interpreter tests to match APFv4" into pi-dev
am: 580a1ed904

Change-Id: Ibe5ad60bb0a7872e1d23ff181933a882fb5873f1