Using support functions to make sure this works also in older APIs
Merge branch 'fix-support' into gradle-appcompat-wip