Merge "Accept an optional PACKAGING env parameter."
am: 6abee81b75

Change-Id: Ib288eecae778ca100c77be14225bc5e79836a651