am 0c51f65b: Merge change 8137 into donut

Merge commit '0c51f65b62e49c1b7ec4c20fdd20126ae36bdf1b'

* commit '0c51f65b62e49c1b7ec4c20fdd20126ae36bdf1b':
  Enforce codename value for minSdkVersion in the Ant build.