Cleanup re. Android 4 and support library