[automerger skipped] Merge "Allow to build non-sparse super image." into qt-dev
am: c202a4f883 -s ours
am skip reason: change_id I76ee09efd02df7caaa8abd37a55ae0bebf9cfa29 with SHA1 b4b2bfc115 is in history

Change-Id: I7a7b2bc5d1729ce8fcf3ebeb49e3af232b6b96e4