Merge "Place the META/ dir first in the target_files.zip." am: 2857b7a3d7
am: 95b0f7d3cc

* commit '95b0f7d3ccfc10659a0c6ac1eaed18284b4e9b55':
  Place the META/ dir first in the target_files.zip.