Merge "ART: Conditionally add debug version to art-runtime package" am: 4478bf52b4
am: f6fffc16ee

Change-Id: I5c2dd1d0134973459538492c6bc338da49b376a6