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