am 56d583ee: Merge "Switch to targetSdkVersion=21. b/16408109" into ub-gmail-ur14-dev

* commit '56d583ee9470e35794bbd830bcc4572627acb597':
  Switch to targetSdkVersion=21. b/16408109