Merge change 8517 into donut

* changes:
  Fix generic-userdebug build (don't build OTA for this target).
tree: 2777f178a247785a2cd0ae64d4703703f7705722
  1. core/
  2. libs/
  3. target/
  4. tools/
  5. buildspec.mk.default
  6. cleanspec.mk
  7. envsetup.sh