Clean up for initial PAC 4.2

Change-Id: I4e2e651dfa1b635b59e54ae678ed86f20d526023
Re-add urushi

Change-Id: Ia35eeca2ea0909ddbf2c056adfce18266af282d7
Re-add mango

Change-Id: I07cf59c447b7228d88d8b0bbf52f43f04e42c4f8
Re-add vigor