Merge "Revert "Install extractors for 1st and 2nd ABIs to the test APEX"" into qt-dev am: eb1b8e4a36
am: 598a532488

Change-Id: I220c0803e2eac9ba1524722d4feea5312f536d58