Merge "Checks that secondary instrumentation ABI matches" into pi-dev
am: 096e0587d2

Change-Id: I87d562322a5b77de9a17dfd803da2c4aa4f2027c