Merge "ART: Use platform_include header library"
am: 3bdf3f2493

Change-Id: I822f6c0ab57d249db5c5b694e15966c2ef3338c6