Merge commit \'f47259b18492c921445d9e437a9f9ed11c52fac6\' into mnc-dr2-dev-plus-aosp
am: 681b3c9fd0

* commit '681b3c9fd0ecf378e054e0c039c6085844705a9c':
  applypatch: Support flash mode.