Merge "Add testcase for issue 52819 about failing to force-rebuild stlport"