Merge "Add dalvik.vm.minidebuginfo property for ART" am: 418a96457c
am: 637814eebf

Change-Id: I0ecf4d2d1922cfe9948936ef3e494f0a71e6c2f5