am 33185233: (-s ours) am 3b753ad5: am dd738c11: Merge "applypatch: Support flash mode."

* commit '33185233541dda72af3fd8a1fc1786251c88e122':