Merge change 8137 into donut

* changes:
  Enforce codename value for minSdkVersion in the Ant build.