Merge change 8064 into donut

* changes:
  Generalize usage of AndroidVersion instead of Api level in the SDK packages.