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

Change-Id: I07429e3a109f4320371411508b5405cf1534522f