Clean up for initial PAC 4.2

Change-Id: I382e1ccaf2e4d705a5b0ada1f7dba4f2544a3484
Re-add urushi

Change-Id: Icfeef98fcc8211b225363d4a8e11159f301a4a14
Re-add mango

Change-Id: I9d9f5ff0af4b3bd402ea22ec464dccca1495400c