Merge "ART: Refactor static include list"
am: d176e93d66

Change-Id: Ib664e334a723d882d5bf851b3d3968ca71648d68