am 8bd72025: resolved conflicts for merge of 8787cd6d to mnc-dev

* commit '8bd720257eeaf9bf28b2dc8a36b856ccc30b1e8c':
  sparse_img.py: Don't write empty map groups.