Add more unit tests for Util.java * Add new addAllToMap and factor out addKeyToMap. Change-Id: I0654ff50b53cfc7539794a750f1d082cf63a9e68