Merge "ART: Fix the debug-build inclusion" am: 8be42d0d30 am: 4dde1dd426
am: 521c21a766

Change-Id: I161037dcf5a939ed2aa6a3d9894fa94610147d34