This hack turns out to be needed by Android 4.0-4.3.

Add a support test so that the hack is invoked only where needed.

Refs 3747cc642a48d2a5a8ac83069f66bddd33bea301

Refs gh-1815
Refs gh-1820
Refs gh-1842
Closes gh-2061