Update packaging.

Change-Id: Id2eb8e35c851912ed01477cfe40edf9a11fa3616