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

Change-Id: I60dc16ffbc53da83c9f693d6a7271348e7a7b857