Clean up for initial PAC 4.2

Change-Id: I40b843077b1cf0c8e5fb41b4b9630651c4a844e1
Re-add urushi

Change-Id: Id8c969903b813d91ac76236bbd9e98c6359192e7
Re-add mango

Change-Id: Ib64d51a760958dd055bfb0c0c1a7515181b9e721