[Extensions] Fix Android build
Merge pull request #1344 from cmarcelo/fix-android

[Extensions] Fix Android build