Merge "Add dalvik.vm.dex2oat-max-image-block-size property"
am: 797f950976

Change-Id: I7c68b50736f9134fe26b243fc974fe24ca9975e4