Merge "Skip apk update tests for non-default abi" into pi-dev am: 7c236e3db1
am: 6b7ffb9f90

Change-Id: Ib9ef44799d0ca045d85fd03f091b2e669c623d1e