Merge "ART: Fix the debug-build inclusion"
am: 8be42d0d30

Change-Id: I2a279857f77e53c300e48d98c789ae51603b8886