Merge "Remove empty zip warning on host builds"
am: fd42c09813

Change-Id: Ic3d788dd7da989da048bfb410ca51bea716e3d08