fix compatibility issues with android support library