DO NOT MERGE Cherry-pick: Fix support-v4 gradle file for api 21

Change-Id: I7e501d3a7237a994b6be7a77c52be40dee7e4efe
3 files changed