Merge "Fix support-v4 gradle file for api 21"