Add apr cross compilation fix from oe-core
Restore original showiframe