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

Change-Id: I707ee1d09f4329ec963b94a46b1f1ed9f9572c23