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

Change-Id: Iba5ecc1ed7f059c4deb5bde2a3c0521cc8ca9e83