am c1558df7: am 34d3aeaf: Merge "Add image creator helper script for OBBs" into gingerbread

Merge commit 'c1558df7778ec5bf9be5ecee9395d4684b6948e2'

* commit 'c1558df7778ec5bf9be5ecee9395d4684b6948e2':
  Add image creator helper script for OBBs