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