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

Change-Id: Ia4869cc2012ec7e7409c6ebb42a2d8291ed08bbf