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

* commit '0aa1f6bffe9aedb6ad3c9625901c5cb395b2084e':
  Switch to targetSdkVersion=21. b/16408109