Merge "Change GC triggering to use mallinfo()" am: c2f685a64f
am: 6a923d1110

Change-Id: If1666a0c9c402975f03b504c8daea90b58a7b8e5