Merge "ART: Include cleanup"
am: af89a91f05

Change-Id: I27882357937e184024489b37f8e5645f5e0e6af4