Clean up for initial PAC 4.2

Change-Id: I9f84c6894d903583bcb876faf6449a2cb5db3e37
Re-add urushi

Change-Id: I486b041129475027a134c6b854cc7a7d1824ba24
Re-add mango

Change-Id: Ie23b842ddef736bad8128bbe8aa3a025871e59cf