Merge "Add missing dalvik.vm properties."