This reverts commit 7b6c0ce9. See if this works on the android builder this time by keeping the original WRAP declaration.