am 2f78b8ba: am 8fead691: Merge change 22448 into donut

Merge commit '2f78b8ba1225a92305ce6c03ef2898055b6a99ac'

* commit '2f78b8ba1225a92305ce6c03ef2898055b6a99ac':
  incremental OTAs should remove /system/recovery.img