Removed dependency to android support library