Clean up for initial PAC 4.2

Change-Id: Ie6b82acb8de88ebb64c4d58bfeaa01e81fd49ead
Re-add urushi

Change-Id: Ifa463da825806d3f6cdad80759877eff83e7057b
Re-add mango

Change-Id: I75d6ee71902c8834b09bb85f126561f28c5a4887