am 652adc23: (-s ours) DO NOT MERGE Cherry-pick: Fix support-v4 gradle file for api 21

* commit '652adc23dd05903b1e644bca6e0472e267c16093':
  DO NOT MERGE Cherry-pick: Fix support-v4 gradle file for api 21