android compilation bugfixes