Clean up for initial PAC 4.2

Change-Id: I40d9413fb940d4ab58d79963ebf21ed723bf6ca3
Re-add urushi

Change-Id: Ibe63bbc3a13e4bbf1b59c9c073ac1520c08a8ece
Re-add mango

Change-Id: I1d89f72c833cf0140e4ef639b2e8bf74b1f17c65