am a307bbc7: am fcb077ea: Merge "Put modules with install path to system/ to DATA/ in the zip file."

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