Merge "Allow to build non-sparse super image."
am: 8c82af2454

Change-Id: I80fd803222956573a04f000e9d0944065c74a8c7