am 0eeeab73: am 15b2b0f7: Merge "keep PLATFORM_ZIP specified explicitly" into jb-mr1-dev

* commit '0eeeab736e3047cec89d69d2e3f034bef83bbc60':
  keep PLATFORM_ZIP specified explicitly