Clean up for initial PAC 4.2

Change-Id: I4e2e651dfa1b635b59e54ae678ed86f20d526023
Re-add urushi

Change-Id: Ia35eeca2ea0909ddbf2c056adfce18266af282d7
Re-add mango

Change-Id: I4557a2b86b364cc7741e3b189c4e1ce41cd75633