This reverts commit 3806a6ae. Reason for revert: Broken test b/172336291, broken duplicate package check Change-Id: I635cf22f77caee24ca68bf97e443796850be2a76