Undo changes made for PR 1383561.
Changes in contrail-packages repo were sufficient.
Undoing changes done earlier in contrail-packaging.

Change-Id: Icf553381ca7a994d9407834e9d186fd3039ca2c8
Closes-PR: 1383561
Merge "Undo changes made for PR 1383561. Changes in contrail-packages repo were sufficient. Undoing changes done earlier in contrail-packaging."