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

Change-Id: I3c9bc9e63e98a41d2a0a5091d6e51e1edcbcac8c