Merge change 22448 into donut

* changes:
  incremental OTAs should remove /system/recovery.img
tree: 332c2904499b6b22b4ac23dafd0bbe9f269fdd3d
  1. core/
  2. libs/
  3. target/
  4. tools/
  5. buildspec.mk.default
  6. cleanspec.mk
  7. envsetup.sh