Merge "Update "Configuring ART" for dalvik.vm properties"