am 696af13a: (-s ours) am a307bbc7: am fcb077ea: Merge "Put modules with install path to system/ to DATA/ in the zip file."

* commit '696af13a6775602ee0aecb148610a55486d69db0':
  Put modules with install path to system/ to DATA/ in the zip file.