Fixes #3156 : Add android support