[automerger skipped] Allow to build non-sparse super image.
am: b4b2bfc115 -s ours
am skip reason: change_id I76ee09efd02df7caaa8abd37a55ae0bebf9cfa29 with SHA1 a482da1d76 is in history

Change-Id: I2705b5683d62a8b8cc41348295686e782ff8f634