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

Change-Id: I5a9e91dd73ecd0a3be9a0d4ca1cff17062559dd1