Merge "Add dalvik-heap device-configs for 4/6GB devices"
am: 6b243fdf22

Change-Id: I04177795d794f02acd64025484cb2b77639abb08