Merge "ART: Make excludes explicit"
am: 6b8d17173e

Change-Id: I61ad1a50a8cfa470c3ea897412cd91ed8bfa12c8