Clean up for initial PAC 4.2

Change-Id: I96d0daa4966e96ec89a22903510e9d92bee77b89
Re-add urushi

Change-Id: I640c37f9184eba41fc374750c6e5ec941660cf03
Re-add mango

Change-Id: Idd4dff5349fad363d5b0713cef177e21bfb9f246