Bug: 18790686 Change-Id: I7d2136fb39b2266f5ae5be24819c617b08a6c21e
So we can remove a few free()s. And also replace a few pointers with references. Change-Id: I4b6332216704f4f9ea4a044b8d4bb7aa42a7ef26