Issue #5742: Avoid android compile issue patch2